refactoring for cppcheck "The scope of the variable can be reduced" (#677)

refactoring for cppcheck "The scope of the variable can be reduced" (#677)

* refactoring for cppcheck "The scope of the variable can be reduced"

The c++17 "If Statement with Initializer" often are useful in resovling
these.

* more scope reduction.

* and another.